Autogenerated HTML docs for v1.5.3.3-114-g2a85
diff --git a/git-merge.txt b/git-merge.txt index 144bc16..eae49c4 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -56,7 +56,7 @@ message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. + Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. HOW MERGE WORKS
